gtk/gtktextchild.c use G_STRLOC instead of G_GNUC_FUNCTION (which is

2008-01-28  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktextchild.c
	* gtk/gtktextview.c: use G_STRLOC instead of G_GNUC_FUNCTION (which
	is deprecated now).

svn path=/trunk/; revision=19416

diff --git a/ChangeLog b/ChangeLog
index b83e493bfc3aece3df0d0d096fb963e12c569c0d..6126ed12c917c8ce81dc64e5b89c14a7b428097c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-28  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktextchild.c
+       * gtk/gtktextview.c: use G_STRLOC instead of G_GNUC_FUNCTION (which
+       is deprecated now).
+
 2008-01-26  Johan Dahlin  <johan@gnome.org>
 
        * tests/Makefile.am:

diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index c952d4c1eb58801284a7f455b80d96cf65d363b9..04adddad307278f93727ed0596002ffe2cf10336 100644 (file)
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -55,21 +55,23 @@
 #include "gtkintl.h"
 #include "gtkalias.h"
 
-#define CHECK_IN_BUFFER(anchor)                                                            \
-  G_STMT_START {                                                                           \
-    if ((anchor)->segment == NULL)                                                         \
-      {                                                                                    \
-        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \
-      }                                                                                    \
+#define CHECK_IN_BUFFER(anchor)                                         \
+  G_STMT_START {                                                        \
+    if ((anchor)->segment == NULL)                                      \
+      {                                                                 \
+        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet",\
+                   G_STRLOC);                                           \
+      }                                                                 \
   } G_STMT_END
 
-#define CHECK_IN_BUFFER_RETURN(anchor, val)                                                \
-  G_STMT_START {                                                                           \
-    if ((anchor)->segment == NULL)                                                         \
-      {                                                                                    \
-        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \
-        return (val);                                                                      \
-      }                                                                                    \
+#define CHECK_IN_BUFFER_RETURN(anchor, val)                             \
+  G_STMT_START {                                                        \
+    if ((anchor)->segment == NULL)                                      \
+      {                                                                 \
+        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet",\
+                   G_STRLOC);                                           \
+        return (val);                                                   \
+      }                                                                 \
   } G_STMT_END
 
 static GtkTextLineSegment *

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index d823e3115ab6aec02eadd8e1a702c546b4fcf7cc..5f18ec01ea6c028bf6989e0c65f6c156d31d7c5e 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -8102,12 +8102,12 @@ gtk_text_view_get_window (GtkTextView *text_view,
       break;
 
     case GTK_TEXT_WINDOW_PRIVATE:
-      g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", G_GNUC_FUNCTION);
+      g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", G_STRLOC);
       return NULL;
       break;
     }
 
-  g_warning ("%s: Unknown GtkTextWindowType", G_GNUC_FUNCTION);
+  g_warning ("%s: Unknown GtkTextWindowType", G_STRLOC);
   return NULL;
 }